Remove remaining single-include guards

diff --git a/gdk-pixbuf/gdk-pixbuf-enum-types.h.template b/gdk-pixbuf/gdk-pixbuf-enum-types.h.template
index 4ecb7161dad9530d23bd308b4a734c576787944b..3989980b03a41806896e2404830066b9df0943b8 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-enum-types.h.template
+++ b/gdk-pixbuf/gdk-pixbuf-enum-types.h.template
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#if !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif
 

diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in
index ea1674d57768ba4a5c44574bb4f31dcbcd26b181..ec5f647ed00ce870570661d4b88158446f541fbf 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-features.h.in
+++ b/gdk-pixbuf/gdk-pixbuf-features.h.in
@@ -1,4 +1,4 @@
-#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#if !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index dfbf48aef3b998fbb0c071af36b1e3dbd7b7e494..b2a5db8da5c7b274329dbcb41a2e23fd072a9218 100644 (file)
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h
index 15f054695420767ccc4ce539b31ddcd7c65c9dc5..8a804e0abc9f02dd88de6729e48aa509a537a03c 100644 (file)
--- a/gdk/gdkdeviceprivate.h
+++ b/gdk/gdkdeviceprivate.h
@@ -17,10 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
 #ifndef __GDK_DEVICE_PRIVATE_H__
 #define __GDK_DEVICE_PRIVATE_H__
 

diff --git a/gdk/gdkenumtypes.h.template b/gdk/gdkenumtypes.h.template
index 85487f47f40b95d3d5ca8f5d0d19fe88ec778d87..7475ee82f3a7feb5ebd3b0b7dca2cf60f40198aa 100644 (file)
--- a/gdk/gdkenumtypes.h.template
+++ b/gdk/gdkenumtypes.h.template
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

diff --git a/gtk/gtktypebuiltins.h.template b/gtk/gtktypebuiltins.h.template
index 9b2538dc136e04e2b2e827418b994c1b415c8a50..ae41837486934e6a75fe0f125801bda5328603dc 100644 (file)
--- a/gtk/gtktypebuiltins.h.template
+++ b/gtk/gtktypebuiltins.h.template
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 

diff --git a/gtk/gtkversion.h.in b/gtk/gtkversion.h.in
index 9db6268840e022732c00c43d5233acf881d597db..e82f9c788670619f685086698fd15873b3e83dbf 100644 (file)
--- a/gtk/gtkversion.h.in
+++ b/gtk/gtkversion.h.in
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif